From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 20 Aug 2014 23:02:46 +0000 (+0200)
Subject: libmodbus: revert to 2.0.4 to unbreak collectd support
X-Git-Tag: v14.07~26
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=98d5c3a15acb46ffa557afbda30f2760ad66168c;p=feed%2Fpackages.git

libmodbus: revert to 2.0.4 to unbreak collectd support

collectd is currently the only user of libmodbus.
Thus include the version of libmodbus which allows collectd
modbus plugin to build.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/libs/libmodbus/Makefile b/libs/libmodbus/Makefile
index f8caab357d..159cce9889 100644
--- a/libs/libmodbus/Makefile
+++ b/libs/libmodbus/Makefile
@@ -8,12 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmodbus
-PKG_VERSION:=3.0.6
+PKG_VERSION:=2.0.4
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://libmodbus.org/releases
-PKG_MD5SUM:=c80f88b6ca19cabc4ceffc195ca07771
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/stephane/libmodbus.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=5881e70bc99a59fdb3466180e6eb1524b491d09d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -39,8 +41,8 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/modbus $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmodbus.{so*,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmodbus.pc $(1)/usr/lib/pkgconfig/
+	# $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	# $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmodbus.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libmodbus/install